bitkeeper revision 1.1108.2.11 (40fe3d42Zl0VaD6XCO_s716MYM1VIQ)

Make the network interrupt handler work on 2.6.

diff --git a/linux-2.6.7-xen-sparse/drivers/xen/net/network.c b/linux-2.6.7-xen-sparse/drivers/xen/net/network.c
index ea0fa45f036148bd865a2a2ea5d9758fb3649294..51646e9c8f0e1d328afe283b878ad96dd7651e6d 100644 (file)
--- a/linux-2.6.7-xen-sparse/drivers/xen/net/network.c
+++ b/linux-2.6.7-xen-sparse/drivers/xen/net/network.c
@@ -371,7 +371,7 @@ static int network_start_xmit(struct sk_buff *skb, struct net_device *dev)
 }
 
 
-static void netif_int(int irq, void *dev_id, struct pt_regs *ptregs)
+static irqreturn_t netif_int(int irq, void *dev_id, struct pt_regs *ptregs)
 {
     struct net_device *dev = dev_id;
     struct net_private *np = dev->priv;
@@ -384,6 +384,8 @@ static void netif_int(int irq, void *dev_id, struct pt_regs *ptregs)
     if ( (np->rx_resp_cons != np->rx->resp_prod) &&
          (np->user_state == UST_OPEN) )
         netif_rx_schedule(dev);
+
+    return IRQ_HANDLED;
 }